Merge from emacs-24; up to r111176
authorGlenn Morris <rgm@gnu.org>
Sun, 13 Jan 2013 20:03:01 +0000 (12:03 -0800)
committerGlenn Morris <rgm@gnu.org>
Sun, 13 Jan 2013 20:03:01 +0000 (12:03 -0800)
commit53980ed5387a6c923928456efc55e73976979d94
treec6101e6496d5cf1e65e4841fb19c58fa10e8ee3d
parent1bfa79f780243ec48482008a2efe833719f4b5e4
parentbd76ead2d7240b086c2ac14ed9d6e8165649d44f
Merge from emacs-24; up to r111176
ChangeLog
doc/misc/ChangeLog
lisp/ChangeLog
lisp/org/ChangeLog
lisp/progmodes/python.el
src/ChangeLog
src/emacs.c
src/nsfont.m
src/sysdep.c